Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 13 Mar 2011 17:28:15 +0000 (10:28 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 13 Mar 2011 17:28:15 +0000 (10:28 -0700)
commit5348a2108a8ae6b794840ed93017b7ddeeb73d0b
treee08444eeddf6f7080b4e63971cad6bee3af7d06c
parent8154f31727077d36540479a235b31a510b01ac95
parentb8994bd08861be2929b82979f92895a250a6534d
Merge from mainline.
src/ChangeLog